* nsterm.m (x_free_frame_resources): Move xfree so freed memory isn't

referenced.

diff --git a/src/ChangeLog b/src/ChangeLog
index 98c4124679b63bcaa63be4db420186200dfe3870..27f54e4bc8d8215ff80baf287af1b568bae4b8cf 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-11  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * nsterm.m (x_free_frame_resources): Move xfree so freed memory isn't
+       referenced (Bug#11583).
+
 2012-06-01  Chong Yidong  <cyd@gnu.org>
 
        * Version 24.1 released.

diff --git a/src/nsterm.m b/src/nsterm.m
index 7cbaf9913111c40d77da7ec43b771ea14414e36f..aad1f3283d6310a7de2107e9cb61a4bb9a1fee11 100644 (file)
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -1158,14 +1158,14 @@ x_free_frame_resources (struct frame *f)
       hlinfo->mouse_face_mouse_frame = 0;
     }
 
-  xfree (f->output_data.ns);
-
   if (f->output_data.ns->miniimage != nil)
     [f->output_data.ns->miniimage release];
 
   [[view window] close];
   [view release];
 
+  xfree (f->output_data.ns);
+
   UNBLOCK_INPUT;
 }